wxGUI: refactoring: Map Display inheriting from wx.Panel #1675

lindakarlovska · 2021-06-22T14:22:13Z

Map Display GUI logic is being changed. For purposes of the Single-Window GUI, MapFrameBase was replaced by MapPanelBase. It subsequently influeced all GUI tools which had been build based on MapFrameBase.
All these tools had to be adapted for new wx.Panel based solution. It had to be coded at once so that's the reason why this PR is too long.

There is the list of influenced GUI tools:

regular Map Display
GCP display (standalone g.gui.gcp)
iclass (standalone g.gui.iclass)
mapswipe (standalone g.gui.mapswipe)
g.gui.image2target
g.gui.photo2target
g.gui.rdigit
g.gui.vdigit
d.mon
example (standalone g.gui.example)

gui/wxpython/lmgr/frame.py

petrasovaa · 2021-06-26T18:04:50Z

Some testing:

switching map displays doesn't switch tabs
renaming tabs in layertree doesn't work (right click on tab - rename)

gui/wxpython/lmgr/frame.py

petrasovaa · 2021-06-26T18:14:36Z

gui/wxpython/lmgr/frame.py

+        # show map display if requested
+        if show:
+            self.currentPage.mapdisplay.Show()
+            self.currentPage.mapdisplay.Refresh()
+            self.currentPage.mapdisplay.Update()


This could be probably moved back to layertree, no?

I wonder what the Refresh and Update are for here, just wondering if it's even necessary.

This could be probably moved back to layertree, no?

Or to CreateNewMapDisplay method? We do not need layertree to get to know the show parameter.

I wonder what the Refresh and Update are for here, just wondering if it's even necessary.

You're right.. not needed.

lindakarlovska · 2021-06-27T09:08:08Z

* switching map displays doesn't switch tabs

I corrected this stuff before those intense unsuccessful changes related to closing and then I somehow lost them :/ ... what to say , just sh*t happens

petrasovaa · 2021-07-07T14:08:32Z

Check FullScreen methods in MapPanelBase, probably should go to the mixin.

lindakarlovska · 2021-07-09T07:15:17Z

Check FullScreen methods in MapPanelBase, probably should go to the mixin.

Oh, you are right, we need also to check methods inherited from wx.TopLevelWindow

lindakarlovska · 2021-07-09T13:37:16Z

Check FullScreen methods in MapPanelBase, probably should go to the mixin.

What do you think about it now? Shall I move SetPosition, SetSize and SetIcon also to FrameMixin?

petrasovaa · 2021-07-09T14:06:13Z

gui/wxpython/gui_core/mapdisp.py

+    def SetFocus(self):
+        self.GetParent().SetFocus()
+
+    def OnFullScreen(self, toolbars, auimgr, event):


I think this should be def ShowFullScreen(self, show) to resemble the actual TopLevelWindow method and inside you would hide/show the toolbars and I think also statusbar. Method IsFullScreen should be defined outside of this method.

gui/wxpython/gui_core/mapdisp.py

petrasovaa · 2021-07-09T14:26:30Z

Check FullScreen methods in MapPanelBase, probably should go to the mixin.

What do you think about it now? Shall I move SetPosition, SetSize and SetIcon also to FrameMixin?

I don't think that's needed.

lindakarlovska · 2021-07-11T09:51:49Z

I am not sure how to deal with DMonGrassInterface. I think after merging #1689, we could remove it. What do you think @petrasovaa?
This interface is also used in v.digit and r.digit.

petrasovaa · 2021-07-11T19:57:16Z

I am not sure how to deal with DMonGrassInterface. I think after merging #1689, we could remove it. What do you think @petrasovaa?
This interface is also used in v.digit and r.digit.

Why? I didn't review the latest changes, so I am probably missing something.

lindakarlovska · 2021-07-12T08:27:04Z

I am not sure how to deal with DMonGrassInterface. I think after merging #1689, we could remove it. What do you think @petrasovaa?
This interface is also used in v.digit and r.digit.

Why? I didn't review the latest changes, so I am probably missing something.

We actually inherit from MapPanelBase because all these panels - d.mon, r.digit, v.vidit inherit from mapdisp/MapPanel . And methods dealing with toolbars and statusbar and probably all other methods left in DMonGrassInterface could be (after #1689) taken from the MapPanelBase class.

gui/wxpython/rdigit/g.gui.rdigit.py

petrasovaa · 2021-07-17T02:23:21Z

Check changes to g.gui.iclass.py, this looks like a mistake.

lindakarlovska · 2021-07-17T08:49:25Z

What I have also noticed when launching these four lines are shown:

(wxgui.py:114279): Gtk-CRITICAL **: 10:46:16.811: gtk_widget_set_size_request: assertion 'width >= -1' failed

(wxgui.py:114279): Gtk-CRITICAL **: 10:46:16.909: gtk_widget_set_size_request: assertion 'width >= -1' failed

(wxgui.py:114279): Gtk-CRITICAL **: 10:46:17.009: gtk_widget_set_size_request: assertion 'width >= -1' failed

And they are then shown whenever I add a new mapdisplay.
Do you have an idea how to suppress them?

petrasovaa · 2021-07-17T19:42:55Z

What I have also noticed when launching these four lines are shown:

(wxgui.py:114279): Gtk-CRITICAL **: 10:46:16.811: gtk_widget_set_size_request: assertion 'width >= -1' failed

And they are then shown whenever I add a new mapdisplay.
Do you have an idea how to suppress them?

That's a pain and not easy to suppress or figure out what causes them. Are these new, i.e. caused by this PR? If yes, it may be worth finding out the gui component causing it.

lindakarlovska · 2021-07-30T14:01:23Z

@petrasova I have scanned gui if there is any SingleMapFrame or DoubleMapFrame stuff remaining and I have found "SingleMapFrame" in doc/gui/wxpython/example.py.. shell I deal with that?

petrasovaa · 2021-07-30T14:04:48Z

@petrasova I have scanned gui if there is any SingleMapFrame or DoubleMapFrame stuff remaining and I have found "SingleMapFrame" in doc/gui/wxpython/example.py.. shell I deal with that?

Good catch, yes please look at it.

lindakarlovska · 2021-07-30T14:46:51Z

@petrasovaa It looks like we did forget to change g.gui.mapswipe with the thing of removing StandaloneGrassInterface. Sorry, I have not noticed before, there were lots of files in #1729 ... I can address it here. What do you think?

lindakarlovska · 2021-07-30T14:51:52Z

@petrasovaa It looks like we did forget to change g.gui.mapswipe with the thing of removing StandaloneGrassInterface. Sorry, I have not noticed before, there were lots of files in #1729 ... I can address it here. What do you think?

Actually both - mapswipe/frame.py as well as mapswipe/g.gui.mapswipe.py, if I look right. We can create another small PR for it as the correction of #1729. The same thing is needed for ExampleMapPanel where on the top of it we also forgot about statusbars - so we could merge these final touches to one smaller PR.

…ng events need to correct)

…exist (checked by grep)

lindakarlovska · 2021-12-08T09:13:00Z

@petrasovaa I have tested it, and it looks good. I think it is ready to merge.

Map Display GUI logic is being changed. For purposes of the Single-Window GUI, MapFrameBase was replaced by MapPanelBase. It subsequently influeced all GUI tools which had been build based on MapFrameBase. All these tools had to be adapted for new wx.Panel based solution.

lindakarlovska marked this pull request as draft June 22, 2021 14:23

petrasovaa reviewed Jun 24, 2021

View reviewed changes

gui/wxpython/lmgr/frame.py Outdated Show resolved Hide resolved

petrasovaa reviewed Jun 25, 2021

View reviewed changes

gui/wxpython/lmgr/frame.py Outdated Show resolved Hide resolved

petrasovaa reviewed Jun 26, 2021

View reviewed changes

gui/wxpython/lmgr/frame.py Outdated Show resolved Hide resolved

petrasovaa reviewed Jun 26, 2021

View reviewed changes

lindakarlovska added gsoc Reserved for Google Summer of Code student(s) GUI wxGUI related labels Jun 28, 2021

petrasovaa reviewed Jul 9, 2021

View reviewed changes

gui/wxpython/gui_core/mapdisp.py Outdated Show resolved Hide resolved

petrasovaa reviewed Jul 14, 2021

View reviewed changes

gui/wxpython/rdigit/g.gui.rdigit.py Outdated Show resolved Hide resolved

lindakarlovska mentioned this pull request Jul 18, 2021

wxGUI: Single-Window GUI: Integrate new map display wx.Panels into a AuiNotebook center pane #1735 #1732

Merged

7 tasks

lindakarlovska force-pushed the wxGUI-refactoring-Map-Display-inherits-from-wxPanel branch 2 times, most recently from 0a3a569 to 6250a0d Compare July 29, 2021 16:50

Linda Kladivova added 23 commits December 8, 2021 01:19

I override wrong file by the mistake

442b099

style and size

d94fc60

corrections from rebase

d0afc62

black

c8841e2

minor edits

0a605a3

last tools - ii2t, ip2i - adapted, now it is ready for testing (closi…

f32775b

…ng events need to correct)

changes in ExampleMapFrame also addressed

fe5a920

g.gui.example has also undergone changes

5fc0295

readme edited

ef0ad45

Edits of description, now no Frame classes of any of these GUI tools …

8f4e30e

…exist (checked by grep)

closing events fixed, now working for all frames (tested)

4b5a209

small reorganization

a0bfdcd

docstrings

1cad717

list of classes updated

1fdd73b

example frame corrected and tested - now works well

742b657

mapswipe script reorganization and updating list of classes

642d6f2

g.gui.example - small edits

42dbca2

black

11fc57b

flake8

3939ec4

flake8, black

3722b0e

spaces

4515ad0

mapswipe and iclass event handlers adapted in Single-Window GUI

4880a3e

conflicts

4e6847c

lindakarlovska force-pushed the wxGUI-refactoring-Map-Display-inherits-from-wxPanel branch from 60ab28d to 4e6847c Compare December 8, 2021 08:49

petrasovaa merged commit 2f94d78 into OSGeo:main Dec 16, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wxGUI: refactoring: Map Display inheriting from wx.Panel #1675

wxGUI: refactoring: Map Display inheriting from wx.Panel #1675

lindakarlovska commented Jun 22, 2021 •

edited

Loading

petrasovaa commented Jun 26, 2021

petrasovaa Jun 26, 2021

petrasovaa Jun 26, 2021

lindakarlovska Jun 27, 2021

lindakarlovska Jun 27, 2021

lindakarlovska commented Jun 27, 2021

petrasovaa commented Jul 7, 2021

lindakarlovska commented Jul 9, 2021 •

edited

Loading

lindakarlovska commented Jul 9, 2021

petrasovaa Jul 9, 2021

lindakarlovska Jul 10, 2021

petrasovaa commented Jul 9, 2021

lindakarlovska commented Jul 11, 2021

petrasovaa commented Jul 11, 2021

lindakarlovska commented Jul 12, 2021 •

edited

Loading

petrasovaa commented Jul 17, 2021

lindakarlovska commented Jul 17, 2021

petrasovaa commented Jul 17, 2021

lindakarlovska commented Jul 30, 2021 •

edited

Loading

petrasovaa commented Jul 30, 2021

lindakarlovska commented Jul 30, 2021 •

edited

Loading

lindakarlovska commented Jul 30, 2021 •

edited

Loading

lindakarlovska commented Dec 8, 2021

wxGUI: refactoring: Map Display inheriting from wx.Panel #1675

wxGUI: refactoring: Map Display inheriting from wx.Panel #1675

Conversation

lindakarlovska commented Jun 22, 2021 • edited Loading

petrasovaa commented Jun 26, 2021

petrasovaa Jun 26, 2021

Choose a reason for hiding this comment

petrasovaa Jun 26, 2021

Choose a reason for hiding this comment

lindakarlovska Jun 27, 2021

Choose a reason for hiding this comment

lindakarlovska Jun 27, 2021

Choose a reason for hiding this comment

lindakarlovska commented Jun 27, 2021

petrasovaa commented Jul 7, 2021

lindakarlovska commented Jul 9, 2021 • edited Loading

lindakarlovska commented Jul 9, 2021

petrasovaa Jul 9, 2021

Choose a reason for hiding this comment

lindakarlovska Jul 10, 2021

Choose a reason for hiding this comment

petrasovaa commented Jul 9, 2021

lindakarlovska commented Jul 11, 2021

petrasovaa commented Jul 11, 2021

lindakarlovska commented Jul 12, 2021 • edited Loading

petrasovaa commented Jul 17, 2021

lindakarlovska commented Jul 17, 2021

petrasovaa commented Jul 17, 2021

lindakarlovska commented Jul 30, 2021 • edited Loading

petrasovaa commented Jul 30, 2021

lindakarlovska commented Jul 30, 2021 • edited Loading

lindakarlovska commented Jul 30, 2021 • edited Loading

lindakarlovska commented Dec 8, 2021

lindakarlovska commented Jun 22, 2021 •

edited

Loading

lindakarlovska commented Jul 9, 2021 •

edited

Loading

lindakarlovska commented Jul 12, 2021 •

edited

Loading

lindakarlovska commented Jul 30, 2021 •

edited

Loading

lindakarlovska commented Jul 30, 2021 •

edited

Loading

lindakarlovska commented Jul 30, 2021 •

edited

Loading